Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge Develop To Staging v3.1.0 #10436

Merged
merged 57 commits into from
Feb 7, 2025
Merged

Merge Develop To Staging v3.1.0 #10436

merged 57 commits into from
Feb 7, 2025

Conversation

nihal467
Copy link
Member

@nihal467 nihal467 commented Feb 6, 2025

No description provided.

renovate bot and others added 30 commits January 31, 2025 22:25
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Bodhish Thomas <bodhish@gmail.com>
Co-authored-by: rithviknishad <mail@rithviknishad.dev>
@nihal467 nihal467 closed this Feb 6, 2025
@nihal467 nihal467 reopened this Feb 6, 2025
@nihal467 nihal467 closed this Feb 6, 2025
@nihal467 nihal467 reopened this Feb 6, 2025
@nihal467 nihal467 marked this pull request as ready for review February 6, 2025 13:52
@nihal467 nihal467 requested a review from a team as a code owner February 6, 2025 13:52
* Fix Content-type header in Scribe.tsx (#7631) (#7634)

Co-authored-by: Ashesh <3626859+Ashesh3@users.noreply.github.com>

* Merge develop to staging v24.16.0 (#7667)

* flaky test (#7657)

* Fix round type display and qr field (#7666)

* Revert "Merge develop to staging v24.16.0 (#7667)" (#7669)

This reverts commit a91230a.

* Fixes neurological tab from crashing in older browsers (patch to `staging`)

* Sainak/fix/pdf-worker-mime-type (#8513)

* Fixes file upload missing pagination component

* Plausible: Track applied filters (#8641)

* disable abha number linking when health facility id is not present

* Revert "disable abha number linking when health facility id is not present"

This reverts commit 63a28a5.

* include icons used in enabled apps while treeshaking the icons

* Fix min date for discharge (#9082)

* replicated the PR 9139

* User creation form bug fix (#9406)

* fixed critical care update redirection

* expose env variables to plugins via window

* Staging Patch: Fix setting time on datetime question causing duplicates (#10370)

* remove hardcoded date encounter notes (#10382)

* added PatientDetailsTabDemographyGeneralInfo plaggable (#10417)

* Staging Patch: Remove appointment type section from patient details page (#10432)

---------

Co-authored-by: Gigin George <mail.gigin@gmail.com>
Co-authored-by: Mohammed Nihal <57055998+nihal467@users.noreply.github.com>
Co-authored-by: Ashesh <3626859+Ashesh3@users.noreply.github.com>
Co-authored-by: Khavin Shankar <khavinshankar@gmail.com>
Co-authored-by: Vignesh Hari <vichuhari100@gmail.com>
Co-authored-by: Aakash Singh <mail@singhaakash.dev>
Co-authored-by: Shivank Kacker <kacker.shivank@gmail.com>
Co-authored-by: Jacob John Jeevan <40040905+Jacobjeevan@users.noreply.github.com>
@github-actions github-actions bot added the merge conflict pull requests with merge conflict label Feb 6, 2025
Copy link

github-actions bot commented Feb 6, 2025

Conflicts have been detected against the base branch. Please merge the base branch into your branch.
cc: @nihal467

See: https://docs.ohc.network/docs/contributing#how-to-resolve-merge-conflicts

@nihal467 nihal467 closed this Feb 6, 2025
@nihal467 nihal467 reopened this Feb 6, 2025
@rithviknishad rithviknishad removed the merge conflict pull requests with merge conflict label Feb 6, 2025
@khavinshankar khavinshankar merged commit 436907b into staging Feb 7, 2025
29 checks passed
Copy link

github-actions bot commented Feb 7, 2025

@nihal467 Your efforts have helped advance digital healthcare and TeleICU systems. 🚀 Thank you for taking the time out to make CARE better. We hope you continue to innovate and contribute; your impact is immense! 🙌

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.